diff --git a/device-common.mk b/device-common.mk
index 9013f03..12ed236 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -28,6 +28,7 @@
 else
 # Adjust the dalvik heap to be appropriate for a tablet.
 $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 endif
 
 # Set vendor kernel path
diff --git a/hikey-common.mk b/hikey-common.mk
index aba5797..b156cc3 100644
--- a/hikey-common.mk
+++ b/hikey-common.mk
@@ -19,4 +19,3 @@
 
 $(call inherit-product, device/linaro/hikey/hikey/device-hikey.mk)
 $(call inherit-product, device/linaro/hikey/device-common.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
diff --git a/hikey960.mk b/hikey960.mk
index 22e8f6f..0107fad 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -23,11 +23,10 @@
 endif
 
 #
-# Inherit the full_base and device configurations
+# Inherit the common device configuration
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/linaro/hikey/hikey960/device-hikey960.mk)
 $(call inherit-product, device/linaro/hikey/device-common.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 
 #setup dm-verity configs
 PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/ff3b0000.ufs/by-name/system